Install Meld from their webpage http://meldmerge.org/ I had to tell git where it was: git config --global merge.tool meld git config --global diff.tool meld
Visual diff and merge tool. Meld helps you compare files, directories, and version controlled projects. It provides two- and three-way comparison of both files ...
Meld is a visual diff and merge utility designed for developers and anyone who regularly works with files and source code. It offers two-way and three-way ...